From d9401c991ff14a0a423da422a5c33298eab6acd8 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 18 May 2011 15:00:25 +0900 Subject: [PATCH] merge trunk --- src/composite.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/composite.c b/src/composite.c index fab7cb86ba8..f069acce1c0 100644 --- a/src/composite.c +++ b/src/composite.c @@ -293,7 +293,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, } else if (VECTORP (components) || CONSP (components)) { - EMACS_UINT len = XVECTOR (key)->size; + EMACS_UINT len = ASIZE (key); /* The number of elements should be odd. */ if ((len % 2) == 0) @@ -326,8 +326,8 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, : COMPOSITION_WITH_RULE_ALTCHARS)); cmp->hash_index = hash_index; glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS - ? (XVECTOR (key)->size + 1) / 2 - : XVECTOR (key)->size); + ? (ASIZE (key) + 1) / 2 + : ASIZE (key)); cmp->glyph_len = glyph_len; cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2); cmp->font = NULL; -- 2.30.2